adjustments

Author: escattone

kitsune/questions/tests/test_utils.py

@@ -1,5 +1,4 @@
 from copy import deepcopy
-from unittest.mock import patch
 
 from django.contrib.contenttypes.models import ContentType
 from parameterized import parameterized
@@ -385,36 +384,3 @@ def test_topic_result_with_no_change(self):
                 notes__contains="Dude, it is so topic1.",
             ).exists()
         )
-
-    def test_topic_result_with_incomplete_transaction(self):
-        question = QuestionFactory(topic=self.topic1, tags=[self.topic1.slug])
-        classification_result = dict(
-            action=ModerationAction.NOT_SPAM,
-            topic_result=dict(
-                topic=self.topic2.title,
-                reason="Dude, it is so topic2.",
-            ),
-        )
-
-        q_ct = ContentType.objects.get_for_model(question)
-
-        self.assertFalse(question.is_spam)
-        self.assertFalse(
-            FlaggedObject.objects.filter(content_type=q_ct, object_id=question.id).exists()
-        )
-        self.assertEqual(question.topic, self.topic1)
-        self.assertEqual(set(tag.name for tag in question.my_tags), {self.topic1.slug})
-
-        with patch.object(question, "save", side_effect=Exception):
-            with self.assertRaises(Exception):
-                process_classification_result(question, classification_result)
-
-        question.refresh_from_db()
-
-        # Since one of the DB changes failed, they all should be rolled back.
-        self.assertFalse(question.is_spam)
-        self.assertEqual(question.topic, self.topic1)
-        self.assertEqual(set(tag.name for tag in question.my_tags), {self.topic1.slug})
-        self.assertFalse(
-            FlaggedObject.objects.filter(content_type=q_ct, object_id=question.id).exists()
-        )

kitsune/questions/utils.py

@@ -7,14 +7,11 @@
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sessions.backends.base import SessionBase
-from django.db import transaction
 
 from kitsune.flagit.models import FlaggedObject
 from kitsune.llm.questions.classifiers import ModerationAction
 from kitsune.products.models import Product, Topic
 from kitsune.questions.models import Answer, Question
-
-# from kitsune.tags.models import SumoTag
 from kitsune.users.models import Profile
 from kitsune.wiki.utils import get_featured_articles as kb_get_featured_articles
 from kitsune.wiki.utils import has_visited_kb
@@ -189,25 +186,21 @@ def process_classification_result(
                 reason=FlaggedObject.REASON_SPAM,
             )
         case _:
-            if not (topic_title := result["topic_result"].get("topic")):
-                return
-
-            try:
-                topic = Topic.active.get(title=topic_title, visible=True)
-            except (Topic.DoesNotExist, Topic.MultipleObjectsReturned):
-                return
-
-            with transaction.atomic():
-                flag_question(
-                    question,
-                    by_user=sumo_bot,
-                    notes=(
-                        "LLM classified as {topic.title}, for the following reason:\n"
-                        f"{result['topic_result']['reason']}"
-                    ),
-                    status=FlaggedObject.FLAG_ACCEPTED,
-                )
-                if topic != question.topic:
+            if topic_title := result["topic_result"].get("topic"):
+                try:
+                    topic = Topic.active.get(title=topic_title, visible=True)
+                except (Topic.DoesNotExist, Topic.MultipleObjectsReturned):
+                    return
+                else:
+                    flag_question(
+                        question,
+                        by_user=sumo_bot,
+                        notes=(
+                            "LLM classified as {topic.title}, for the following reason:\n"
+                            f"{result['topic_result']['reason']}"
+                        ),
+                        status=FlaggedObject.FLAG_ACCEPTED,
+                    )
                     if question.topic:
                         question.tags.remove(question.topic.slug)
                     question.topic = topic